Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(UX): record reason for skipping attendance or marking absent for auto attendance #30844

Merged
merged 1 commit into from
Apr 29, 2022

Conversation

ruchamahabal
Copy link
Member

@ruchamahabal ruchamahabal commented Apr 29, 2022

Problem

In the Auto Attendance scheduler job there are multiple reasons why an employee is marked Absent or attendance is skipped for check-in records. The user has to compare the calculated working hours with the shift timings and investigate Employee Check-ins to find out why the employee was marked Absent or why attendance was skipped for the employee.

Fix

Add comments to the Attendance record when the scheduler runs:

For not meeting the working hours threshold:

image

Due to missing Employee Checkins:

image

Add relevant comments to Employee Checkin when the scheduler runs:

The Skip Auto Attendance checkbox is editable so this comment is required to distinguish whether it was skipped during the scheduler job or skipping was enabled by the user during log creation:

image

Adding comments of type "Comment" instead of "Info" because comments are visible in the report view and can be exported.

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Apr 29, 2022
@ruchamahabal ruchamahabal removed the needs-tests This PR needs automated unit-tests. label Apr 29, 2022
@codecov
Copy link

codecov bot commented Apr 29, 2022

Codecov Report

Merging #30844 (5ad78ed) into develop (389c285) will decrease coverage by 0.18%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop   #30844      +/-   ##
===========================================
- Coverage    61.83%   61.65%   -0.19%     
===========================================
  Files         1079     1079              
  Lines        69700    69715      +15     
===========================================
- Hits         43100    42981     -119     
- Misses       26600    26734     +134     
Impacted Files Coverage Δ
...xt/hr/doctype/employee_checkin/employee_checkin.py 94.26% <100.00%> (+0.62%) ⬆️
erpnext/hr/doctype/shift_type/shift_type.py 86.41% <100.00%> (+0.34%) ⬆️
...eport/item_variant_details/item_variant_details.py 31.32% <0.00%> (-53.02%) ⬇️
...tch_item_expiry_status/batch_item_expiry_status.py 67.92% <0.00%> (-24.53%) ⬇️
...wise_balance_history/batch_wise_balance_history.py 67.79% <0.00%> (-22.04%) ⬇️
...em_wise_sales_register/item_wise_sales_register.py 51.58% <0.00%> (-11.77%) ⬇️
...saction/incorrect_balance_qty_after_transaction.py 88.37% <0.00%> (-9.31%) ⬇️
...t/accounts/report/sales_register/sales_register.py 70.76% <0.00%> (-7.02%) ⬇️
...unts/report/purchase_register/purchase_register.py 71.71% <0.00%> (-6.58%) ⬇️
...urity_shortfall/process_loan_security_shortfall.py 93.75% <0.00%> (-6.25%) ⬇️
... and 27 more

@ruchamahabal
Copy link
Member Author

skip_attendance_in_checkins is already covered in tests. Not adding tests for comments.

@ruchamahabal ruchamahabal merged commit 6574294 into frappe:develop Apr 29, 2022
rootsec1 added a commit to rootsec1/erpnext that referenced this pull request May 4, 2022
* fix: Allow multi-currency opening invoices

* feat: add payment terms status rpr to Selling homepage

* fix: Consistent accounting dimensions across Sales and Purchase docs

* fix: Ignore custom field validation while setup

* chore: Remove domains from Setup

* refactor: Remove education domain from ERPNext

* chore: remove files related to LMS

* chore: clean up hooks

* chore: Remove course links from training doctypes

* chore: Remove references for Assessment Group

* chore: Remove Fees Doctype

* chore: Remove references for Student doctype

* chore: Add patch to delete education doctypes

* chore: Clean up patches

* fix: Multi currency opening invoices

* fix(UX): record reason for skipping attendance or marking absent for auto attendance (frappe#30844)

* fix: Cost center filter on payment reconciliation

* fix(minor): discount accounting patch

* fix(minor): fix create_accounting_dimensions_in_orders.py

* feat: Copy task color from project template (frappe#30857)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>

* chore: correct link

* fix: convert default_item_manufacturer to link field (frappe#30835)

* fix(minor): update frappe.error_log to new API (frappe#30864)

* fix(minor): update frappe.error_log to new API

* refactor: changes for updated log_error api

Co-authored-by: Ankush Menat <ankush@frappe.io>

* fix(UX): misleading stock entry lables (frappe#30870)

* fix(UX): misleading stock entry lables

* chore: field labels

[skip ci]

Co-authored-by: Marica <maricadsouza221197@gmail.com>

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* test: Add test for payment reconciliation

* fix: Vat Audit report fixes

(cherry picked from commit d5319a4)

* fix: Supply type for overseas invoices with payment of tax

* fix: supply type for sez invoices with payment of tax

* fix(india): e-invoice generation for registered composition gst category type (frappe#30814)

* fix: supplier quotation comparission report button

* fix: payment days calculation for employees joining/leaving mid-month (frappe#30863)

* chore: Resolve conflicts

* fix: Ignore loan repayments made from salary slip

(cherry picked from commit b7e1d40)

* fix: show group warehouse in Sales Order (frappe#30891)

* fix: Show linked time sheets in sales invoice dashboard

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Rushabh Mehta <rmehta@gmail.com>
Co-authored-by: sersaber <93864988+sersaber@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
Co-authored-by: maharshivpatel <39730881+maharshivpatel@users.noreply.github.com>
Co-authored-by: Francisco Roldán <franciscoproldan@gmail.com>
hrwX pushed a commit to hrwX/erpnext that referenced this pull request May 10, 2022
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Nov 10, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant